From 499681128cd67a16b8d9d053f0f5706e2a29d2a2 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 12 May 2008 11:19:09 +0100 Subject: [PATCH] xend: Add syntax check for block devices If we define wrong values to a disk parameter in domain configuration files, we get an error message or a guest OS panic. 1. If we define a wrong disk type, xm create command error occurs about 100 seconds later. e.g. disk=['xyz:/xen/root-vm1.img,hda1,w'] 2. If we forget a disk type, a guest OS panic occurs. e.g. disk=['/xen/root-vm1.img,hda1,w'] Signed-off-by: Masaki Kanno --- tools/python/xen/xend/server/blkif.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index 84d9b23f8e..6305a64ac7 100644 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -56,8 +56,12 @@ class BlkifController(DevController): else: try: (typ, params) = string.split(uname, ':', 1) + if typ not in ('phy', 'file'): + raise VmError( + 'Block device must have "phy" or "file" specified to type') except ValueError: - (typ, params) = ("", "") + raise VmError( + 'Block device must have physical details specified') mode = config.get('mode', 'r') if mode not in ('r', 'w', 'w!'): -- 2.30.2